SOURCES: alpine-doc.patch (NEW), alpine-fhs.patch (NEW), alpine-fi...

baggins baggins at pld-linux.org
Mon Nov 5 15:48:54 CET 2007


Author: baggins                      Date: Mon Nov  5 14:48:54 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- ported from pine

---- Files affected:
SOURCES:
   alpine-doc.patch (NONE -> 1.1)  (NEW), alpine-fhs.patch (NONE -> 1.1)  (NEW), alpine-filter.patch (NONE -> 1.1)  (NEW), alpine-fixhome.patch (NONE -> 1.1)  (NEW), alpine-home_etc.patch (NONE -> 1.1)  (NEW), alpine-libc-client.patch (NONE -> 1.1)  (NEW), alpine-no_1777_warning.patch (NONE -> 1.1)  (NEW), alpine-quote.patch (NONE -> 1.1)  (NEW), alpine-segfix.patch (NONE -> 1.1)  (NEW), alpine-ssl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/alpine-doc.patch
diff -u /dev/null SOURCES/alpine-doc.patch:1.1
--- /dev/null	Mon Nov  5 15:48:54 2007
+++ SOURCES/alpine-doc.patch	Mon Nov  5 15:48:49 2007
@@ -0,0 +1,180 @@
+--- alpine-0.9999/doc/alpine.1	Sun Nov  5 19:42:54 2000
++++ alpine-0.9999.new/doc/alpine.1	Sun Nov  5 19:36:14 2000
+@@ -284,7 +284,7 @@
+ .if n .ta 2.8i
+ .if t .ta 2.1i
+ 
+-/usr/spool/mail/xxxx	Default folder for incoming mail.
++/var/mail/xxxx		Default folder for incoming mail.
+ .br
+ ~/mail	Default directory for mail folders.
+ .br
+@@ -308,13 +308,13 @@
+ .br
+ /etc/mime.types	System-wide file ext. to MIME type mapping
+ .br
+-/usr/local/lib/pine.info	Local pointer to system administrator.
++/usr/lib/pine.info		Local pointer to system administrator.
+ .br
+-/usr/local/lib/pine.conf	System-wide configuration file.
++/etc/pine.conf		System-wide configuration file.
+ .br
+-/usr/local/lib/pine.conf.fixed	 Non-overridable configuration file.
++/etc/pine.conf.fixed	 Non-overridable configuration file.
+ .br
+-/tmp/.\\usr\\spool\\mail\\xxxx	Per-folder mailbox lock files.
++/tmp/.\\var\\mail\\xxxx		Per-folder mailbox lock files.
+ .br
+ ~/.pine-interrupted-mail	Message which was interrupted.
+ .br
+--- alpine-0.9999/doc/tech-notes.txt	2007-08-30 03:12:18.000000000 +0200
++++ alpine-0.9999.new/doc/tech-notes.txt	2007-11-05 13:21:48.000000000 +0100
+@@ -271,14 +271,14 @@
+    The selection of which MTA to use depends on the settings of smtp-server,
+    sendmail-path, and compile-time options. The first MTA specified in the
+    following list is used:
+-    1. _sendmail-path_ in /usr/local/lib/pine.conf.fixed
+-    2. _smtp-server_ in /usr/local/pine.conf.fixed
++    1. _sendmail-path_ in /etc/pine.conf.fixed
++    2. _smtp-server_ in /etc/pine.conf.fixed
+     3. _sendmail-path_ specified on the command line.
+     4. _smtp-server_ specified on the command line.
+     5. _sendmail-path_ in the user's .pinerc file.
+     6. _smtp-server_ in the user's .pinerc file.
+-    7. _sendmail-path_ in /usr/local/lib/pine.conf
+-    8. _smtp-server_ in /usr/local/pine.conf
++    7. _sendmail-path_ in /etc/pine.conf
++    8. _smtp-server_ in /etc/pine.conf
+     9. DF_SENDMAIL_PATH defined at compile time.
+    10. SENDMAIL and SENDMAILFLAGS defined at compile time.
+ 
+@@ -590,13 +590,13 @@
+ 
+    Installing _Alpine_ and _Pico_ is simple. You take the program files which
+    you  have  just  transferred or built and you move them to the correct
+-   directory on your system. Most often the binaries go in /usr/local/bin
++   directory on your system. Most often the binaries go in /usr/bin
+    though sometimes they are placed in /usr/bin. All the help text is compiled
+    into _Alpine_ so there are no _required_ auxiliary files. Instead of copying
+    the binaries manually, you may use make install to install them.
+ 
+-   There  are  three  optional auxiliary files: /usr/local/lib/pine.info,
+-   /usr/local/lib/pine.conf, and /usr/local/lib/pine.conf.fixed. The file
++   There  are  three  optional auxiliary files: /usr/lib/pine.info,
++   /etc/pine.conf, and /etc/pine.conf.fixed. The file
+    pine.info contains text on how to get further help on the local system. It
+    is part of the help text for the main menu and should probably refer to the
+    local help desk or the system administrator. If this file doesn't exist a
+@@ -670,11 +670,11 @@
+    This section lists the various files which _Alpine_ uses which are not email
+    folders. All of these are the default names of files, they may vary based on
+    _Alpine_'s configuration.
+-   /usr/local/lib/pine.conf
++   /etc/pine.conf
+           Pine's global configuration file.
+-   /usr/local/lib/pine.conf.fixed
++   /etc/pine.conf.fixed
+           Non-overridable global configuration file.
+-   /usr/local/lib/pine.info
++   /usr/lib/pine.info
+           Local pointer to system administrator.
+    ~/.pinerc
+           Personal configuration file for each user.
+@@ -868,10 +868,10 @@
+           Configuration: Prints a sample system configuration file to the
+           screen  or  standard  output.  To  generate  an  initial system
+           configuration file, execute
+-                alpine -conf > /usr/local/lib/pine.conf
++                alpine -conf > /etc/pine.conf
+           To generate a system configuration file using settings from an old
+           system configuration file, execute
+-                alpine -P old-pine.conf -conf > /usr/local/lib/pine.conf
++                alpine -P old-pine.conf -conf > /etc/pine.conf
+           A system configuration file is not required.
+    -convert_sigs _-p pinerc_
+           Convert  signatures  contained  in signature files into literal
+@@ -969,7 +969,7 @@
+           Pinerc may be either a local file or a remote configuration folder.
+    -P _pinerc_
+           Uses the named file as the system wide configuration file instead of
+-          _/usr/local/lib/pine.conf_ on UNIX, or nothing on _PC-Alpine_. Pinerc
++          _/etc/pine.conf_ on UNIX, or nothing on _PC-Alpine_. Pinerc
+           may be either a local file or a remote configuration folder.
+    -passfile _passfile_
+           This tells _Alpine_ what file should be used as the password file.
+@@ -1175,8 +1175,8 @@
+    configuration. In most cases, the compiled-in preferences will suit users
+    and administrators just fine. When running _Alpine_ on a UNIX system, the
+    default built-in configuration can be changed by setting variables in the
+-   system     configuration     files,     /usr/local/lib/pine.conf    or
+-   /usr/local/lib/pine.conf.fixed. (Actually, these files can be changed using
++   system     configuration     files,     /etc/pine.conf    or
++   /etc/pine.conf.fixed. (Actually, these files can be changed using
+    the      configure     arguments     --with-system-pinerc=VALUE     or
+    --with-system-fixed-pinerc=VALUE.) The location of the pine.conf file can be
+    changed  with  the -P command line argument. Both _Alpine_ and _PC-Alpine_
+@@ -3433,7 +3433,7 @@
+           For  Unix  _Alpine_ the program _ispell_ works well as an alternate
+           spell  checker.  If  your Unix system has _ispell_ it is probably
+           reasonable to make it the default speller by configuring it as the
+-          default in the system configuration file, /usr/local/lib/pine.conf.
++          default in the system configuration file, /etc/pine.conf.
+           If this option is not set, then the system's _spell_ command is used.
+           The spell command does not work the same as the alternate speller. It
+           produces a list of misspelled words on its standard output, instead,
+@@ -3810,12 +3810,12 @@
+           must exist as a full path or a path relative to your home directory).
+           Now for an example:
+ 
+-     url-viewers=_TEST("test -n '${DISPLAY}'")_ /usr/local/bin/netscape,
+-     /usr/local/bin/lynx, C:\BIN\NETSCAPE.BAT
++     url-viewers=_TEST("test -n '${DISPLAY}'")_ /opt/netscape/netscape,
++     /usr/bin/lynx, C:\BIN\NETSCAPE.BAT
+           This example shows that for the first browser in the list to be used
+           the environment variable DISPLAY must be defined. If it is, then the
+-          file /usr/local/bin/netscape must exist. If either condition is not
+-          met, then the file /usr/local/bin/lynx must exist. If it doesn't,
++          file /opt/netscape/netscape must exist. If either condition is not
++          met, then the file /usr/bin/lynx must exist. If it doesn't,
+           then the final path and file must exist. Note that the last entry is
+           a DOS/Windows path. This is one way to support _Alpine_ running on
+           more than one architecture with the same configuration file.
+@@ -10012,9 +10012,9 @@
+     4. a command line argument
+     5. the system-wide _fixed_ configuration file (Unix _Alpine_ only)
+ 
+-   The fixed configuration file is normally /usr/local/lib/pine.conf.fixed.
++   The fixed configuration file is normally /etc/pine.conf.fixed.
+ 
+-   The system-wide configuration file is normally /usr/local/lib/pine.conf for
++   The system-wide configuration file is normally /etc/pine.conf for
+    Unix  _Alpine_  and is normally not set for _PC-Alpine_. For _PC-Alpine_, if
+    the  environment  variable  _$PINECONF_  is  set,  that  is used for the
+    system-wide  configuration. This location can be set or changed on the
+@@ -10263,7 +10263,7 @@
+      * A program that implements the SMTP or ESMTP protocol via stdio.
+      * An entry in /etc/services for the alternate service.
+      * An entry in /etc/inetd.conf for the alternate service.
+-     * An entry in /usr/local/lib/pine.conf, /usr/local/lib/pine.conf.fixed or
++     * An entry in /etc/pine.conf, /etc/pine.conf.fixed or
+        ~/.pinerc.
+      _________________________________________________________________
+ 
+@@ -10272,7 +10272,7 @@
+    _Alpine_'s MIME-TYPE support is based on code contributed by Hans Drexler
+    <drexler at mpi.nl>. _Alpine_ assigns MIME Content-Types according to
+    file    name    extensions    found    in    the   system-wide   files
+-   /usr/local/lib/mime.types  and  /etc/mime.types,  and  a user specific
++   /etc/mime.types  and  /usr/lib/mime.types,  and  a user specific
+    ~/.mime.types file.
+ 
+    In Windows, _Alpine_ looks in the same directory as the PINERC file and the
+@@ -11097,7 +11097,7 @@
+ 
+    The second selection is the standard UNIX print command. The default is
+    _lpr_, but it can be changed on a system basis to anything so desired in
+-   /usr/local/lib/pine.conf.
++   /etc/pine.conf.
+ 
+    The third selection is the user's personal choice for a UNIX print command.
+    The text to be printed is piped into the command. _Enscript_ or _lpr_ with

================================================================
Index: SOURCES/alpine-fhs.patch
diff -u /dev/null SOURCES/alpine-fhs.patch:1.1
--- /dev/null	Mon Nov  5 15:48:54 2007
+++ SOURCES/alpine-fhs.patch	Mon Nov  5 15:48:49 2007
@@ -0,0 +1,21 @@
+diff -Nru pine4.30/imap/src/osdep/unix/Makefile pine4.30.new/imap/src/osdep/unix/Makefile
+--- pine4.30/imap/src/osdep/unix/Makefile	Sun Nov  5 20:10:40 2000
++++ pine4.30.new/imap/src/osdep/unix/Makefile	Sun Nov  5 20:14:00 2000
+@@ -392,7 +392,7 @@
+ 	@echo in the C library, you must use slx, sl4, or sl5 instead!
+ 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
+ 	 SIGTYPE=psx CRXTYPE=nfs \
+-	 SPOOLDIR=/var/spool \
++	 SPOOLDIR=/var/ \
+ 	 ACTIVEFILE=/var/lib/news/active \
+ 	 RSHPATH=/usr/bin/rsh \
+ 	 BASECFLAGS="$(OPTIMIZE) -DNFSKLUDGE" \
+@@ -556,7 +556,7 @@
+ 	@echo If you want libc4 versions you must use sl4 instead!
+ 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
+ 	 SIGTYPE=psx CHECKPW=psx CRXTYPE=nfs \
+-	 SPOOLDIR=/var/spool \
++	 SPOOLDIR=/var \
+ 	 ACTIVEFILE=/var/lib/news/active \
+ 	 RSHPATH=/usr/bin/rsh \
+ 	 BASECFLAGS="$(OPTIMIZE) -DNFSKLUDGE" \

================================================================
Index: SOURCES/alpine-filter.patch
diff -u /dev/null SOURCES/alpine-filter.patch:1.1
--- /dev/null	Mon Nov  5 15:48:54 2007
+++ SOURCES/alpine-filter.patch	Mon Nov  5 15:48:49 2007
@@ -0,0 +1,25 @@
+--- alpine-0.9999/imap/src/osdep/unix/env_unix.c~	2007-08-16 21:43:35.000000000 +0200
++++ alpine-0.9999/imap/src/osdep/unix/env_unix.c	2007-11-05 14:26:20.000000000 +0100
+@@ -168,18 +168,18 @@
+ 	/* #public - everybody can read/write */
+ static char *publicHome = NIL;	/* public home directory */
+ static long public_protection =	/* default public file protection */
+-  S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH;
++  S_IRUSR|S_IWUSR;
+ 				/* default public directory protection */
+ static long public_dir_protection =
+-  S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH;
++  S_IRUSR|S_IWUSR|S_IXUSR;
+ 
+ 	/* #shared/ - owner and group members can read/write */
+ static char *sharedHome = NIL;	/* shared home directory */
+ 				/* default shared file protection */
+-static long shared_protection = S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP;
++static long shared_protection = S_IRUSR|S_IWUSR;
+ 				/* default shared directory protection */
+ static long shared_dir_protection =
+-  S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP;
++  S_IRUSR|S_IWUSR|S_IXUSR;
+ 
+ /* OS bug workarounds - should be avoided at all cost */
+ 

================================================================
Index: SOURCES/alpine-fixhome.patch
diff -u /dev/null SOURCES/alpine-fixhome.patch:1.1
--- /dev/null	Mon Nov  5 15:48:54 2007
+++ SOURCES/alpine-fixhome.patch	Mon Nov  5 15:48:49 2007
@@ -0,0 +1,24 @@
+--- alpine-0.9999/pico/osdep/terminal.c~	2007-11-02 16:19:06.000000000 +0100
++++ alpine-0.9999/pico/osdep/terminal.c	2007-11-05 14:46:34.000000000 +0100
+@@ -179,8 +179,8 @@
+      */
+     kpinsert("\033[4J", KEY_PGUP, 1);
+     kpinsert("\033[3J", KEY_PGDN, 1);
+-    kpinsert("\033[2J", KEY_HOME, 1);
+-    kpinsert("\033[N",  KEY_END, 1);
++    kpinsert("\033[1~", KEY_HOME, 1);
++    kpinsert("\033[4~",  KEY_END, 1);
+ 
+     /*
+      * vt220?
+@@ -924,8 +924,8 @@
+      */
+     kpinsert("\033[4J", KEY_PGUP, 1);
+     kpinsert("\033[3J", KEY_PGDN, 1);
+-    kpinsert("\033[2J", KEY_HOME, 1);
+-    kpinsert("\033[N",  KEY_END, 1);
++    kpinsert("\033[1~", KEY_HOME, 1);
++    kpinsert("\033[4~", KEY_END, 1);
+ 
+     /*
+      * vt220?

================================================================
Index: SOURCES/alpine-home_etc.patch
diff -u /dev/null SOURCES/alpine-home_etc.patch:1.1
--- /dev/null	Mon Nov  5 15:48:54 2007
+++ SOURCES/alpine-home_etc.patch	Mon Nov  5 15:48:49 2007
@@ -0,0 +1,67 @@
+--- alpine-0.9999/configure.ac.orig	2007-08-22 00:13:29.000000000 +0200
++++ alpine-0.9999/configure.ac	2007-11-05 15:24:56.000000000 +0100
+@@ -765,6 +765,15 @@
+ 
+ dnl CHECK LIBRARIES
+ 
++AC_CHECK_LIB(home_etc, get_home_etc_static,
++	     [
++	      AC_CHECK_HEADER([home_etc.h])
++	      LIBS="$LIBS -lhome_etc"
++	      have_home_etc=yes
++	      AC_DEFINE(HAVE_HOME_ETC,1,[ Define if want to use the HOME-ETC library. ])
++	     ],
++	     AC_MSG_ERROR([could not find libhome_etc]))
++
+ if test x$enable_dmalloc = "xyes" ; then
+   if test "x$with_pthread" = "xyes" ; then
+     dmalloc_lib=dmallocth
+--- alpine-0.9999/alpine/pine-use.c~	2006-09-22 22:06:05.000000000 +0200
++++ alpine-0.9999/alpine/pine-use.c	2007-11-05 15:13:10.000000000 +0100
+@@ -20,6 +20,13 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++#ifdef HAVE_HOME_ETC
++# include <home_etc.h>
++# define HOMEDIR _HEdir
++#else
++# define HOMEDIR pw->pw_dir
++#endif
++
+ #ifndef MAILSPOOLPCTS
+ #define MAILSPOOLPCTS "/usr/spool/mail/%s"
+ /* #define MAILSPOOLPCTS "/usr/mail/%s" */
+@@ -74,7 +81,7 @@
+         if(strcmp(pw->pw_dir, "/") == 0)
+           continue;
+ 
+-        sprintf(filename, "%s/.pinerc", pw->pw_dir);
++        sprintf(filename, "%s/.pinerc", HOMEDIR);
+         if(stat(filename, &statb) < 0)
+           continue;
+         if(statb.st_mtime + 7 * DAYSEC > now) 
+--- alpine-0.9999/pith/conf.c~	2007-11-02 16:19:06.000000000 +0100
++++ alpine-0.9999/pith/conf.c	2007-11-05 15:12:00.000000000 +0100
+@@ -57,6 +57,12 @@
+ #include "../pico/osdep/mswin.h"
+ #endif
+ 
++#ifdef HAVE_HOME_ETC
++# include <home_etc.h>
++# define HOMEDIR _HEdir
++#else
++# define HOMEDIR ps->home_dir
++#endif
+ 
+ #define	TO_BAIL_THRESHOLD	60
+ 
+@@ -1473,7 +1479,7 @@
+     }
+ 
+     if(!ps->pinerc){
+-      build_path(buf, ps->home_dir, ".pinerc", sizeof(buf));
++      build_path(buf, HOMEDIR, ".pinerc", sizeof(buf));
+       ps->pinerc = cpystr(buf);
+     }
+ 

================================================================
Index: SOURCES/alpine-libc-client.patch
diff -u /dev/null SOURCES/alpine-libc-client.patch:1.1
--- /dev/null	Mon Nov  5 15:48:54 2007
+++ SOURCES/alpine-libc-client.patch	Mon Nov  5 15:48:49 2007
@@ -0,0 +1,43 @@
+--- alpine-0.9999/imap/src/osdep/unix/unix.c~	2007-08-31 02:50:06.000000000 +0200
++++ alpine-0.9999/imap/src/osdep/unix/unix.c	2007-11-05 14:40:33.000000000 +0100
+@@ -329,7 +329,7 @@
+   int i,fd;
+   time_t ti = time (0);
+   if (!(s = dummy_file (mbx,mailbox))) {
+-    sprintf (tmp,"Can't create %.80s: invalid name",mailbox);
++    snprintf (tmp,MAILTMPLEN,"Can't create %.80s: invalid name",mailbox);
+     MM_LOG (tmp,ERROR);
+   }
+ 				/* create underlying file */
+@@ -339,25 +339,25 @@
+ 	mail_parameters (NIL,GET_USERHASNOLIFE,NIL)) ret = T;
+     else if ((fd = open (mbx,O_WRONLY,
+ 		    (long) mail_parameters (NIL,GET_MBXPROTECTION,NIL))) < 0) {
+-      sprintf (tmp,"Can't reopen mailbox node %.80s: %s",mbx,strerror (errno));
++      snprintf (tmp,MAILTMPLEN,"Can't reopen mailbox node %.80s: %s",mbx,strerror (errno));
+       MM_LOG (tmp,ERROR);
+       unlink (mbx);		/* delete the file */
+     }
+     else {			/* initialize header */
+       memset (tmp,'\0',MAILTMPLEN);
+-      sprintf (tmp,"From %s %sDate: ",pseudo_from,ctime (&ti));
++      snprintf (tmp,MAILTMPLEN,"From %s %sDate: ",pseudo_from,ctime (&ti));
+       rfc822_fixed_date (s = tmp + strlen (tmp));
+ 				/* write the pseudo-header */
+-      sprintf (s += strlen (s),
++      snprintf (s += strlen (s),MAILTMPLEN,
+ 	       "\nFrom: %s <%s@%s>\nSubject: %s\nX-IMAP: %010lu 0000000000",
+ 	       pseudo_name,pseudo_from,mylocalhost (),pseudo_subject,
+ 	       (unsigned long) ti);
+       for (i = 0; i < NUSERFLAGS; ++i) if (default_user_flag (i))
+-	sprintf (s += strlen (s)," %s",default_user_flag (i));
+-      sprintf (s += strlen (s),"\nStatus: RO\n\n%s\n\n",pseudo_msg);
++	snprintf (s += strlen (s),MAILTMPLEN," %s",default_user_flag (i));
++      snprintf (s += strlen (s),MAILTMPLEN,"\nStatus: RO\n\n%s\n\n",pseudo_msg);
+       if (write (fd,tmp,strlen (tmp)) > 0) ret = T;
+       else {
+-	sprintf (tmp,"Can't initialize mailbox node %.80s: %s",mbx,
++	snprintf (tmp,MAILTMPLEN,"Can't initialize mailbox node %.80s: %s",mbx,
+ 		 strerror (errno));
+ 	MM_LOG (tmp,ERROR);
+ 	unlink (mbx);		/* delete the file */

================================================================
Index: SOURCES/alpine-no_1777_warning.patch
diff -u /dev/null SOURCES/alpine-no_1777_warning.patch:1.1
--- /dev/null	Mon Nov  5 15:48:54 2007
+++ SOURCES/alpine-no_1777_warning.patch	Mon Nov  5 15:48:49 2007
@@ -0,0 +1,24 @@
+--- alpine-0.9999/imap/src/osdep/unix/env_unix.c~	2007-11-05 14:26:20.000000000 +0100
++++ alpine-0.9999/imap/src/osdep/unix/env_unix.c	2007-11-05 14:50:21.000000000 +0100
+@@ -1215,20 +1215,7 @@
+     }
+ 
+     MM_NOCRITICAL (NIL);	/* no longer critical */
+-				/* find directory/file delimiter */
+-    if (s = strrchr (base->lock,'/')) {
+-      *s = '\0';		/* tie off at directory */
+-      sprintf(tmp,		/* generate default message */
+-	      "Mailbox vulnerable - directory %.80s must have 1777 protection",
+-	      base->lock);
+-				/* definitely not 1777 if can't stat */
+-      mask = stat (base->lock,&sb) ? 0 : (sb.st_mode & 1777);
+-      *s = '/';			/* restore lock name */
+-      if (mask != 1777) {	/* default warning if not 1777 */
+-	if (!disableLockWarning) MM_LOG (tmp,WARN);
+-	break;
+-      }
+-    }
++    break;
+   default:
+     sprintf (tmp,"Mailbox vulnerable - error creating %.80s: %s",
+ 	     base->lock,strerror (errno));

================================================================
Index: SOURCES/alpine-quote.patch
diff -u /dev/null SOURCES/alpine-quote.patch:1.1
--- /dev/null	Mon Nov  5 15:48:54 2007
+++ SOURCES/alpine-quote.patch	Mon Nov  5 15:48:49 2007
@@ -0,0 +1,28 @@
+--- alpine-0.9999/pith/mailcap.c~	2007-08-15 22:28:09.000000000 +0200
++++ alpine-0.9999/pith/mailcap.c	2007-11-05 14:32:39.000000000 +0100
+@@ -881,17 +881,19 @@
+ 		     * have to put those outside of the single quotes.
+ 		     * (The parm+1000 nonsense is to protect against
+ 		     * malicious mail trying to overlow our buffer.)
++		     *
++		     * TCH - Change 2/8/1999
++		     * Also quote the ` slash to prevent execution of arbirtrary code
+ 		     */
+ 		    for(p = parm; *p && p < parm+1000; p++){
+-			if(*p == '\''){
+-			    if(to-tmp_20k_buf+3 < SIZEOF_20KBUF){
++			if((*p == '\'')||(*p=='`')){
++			    if(to-tmp_20k_buf+4 < SIZEOF_20KBUF){
+ 				*to++ = '\'';  /* closing quote */
+ 				*to++ = '\\';
+-				*to++ = '\'';  /* below will be opening quote */
++				*to++ = *p; /* quoted character */
++				*to++ = '\'';  /* opening quote */
+ 			    }
+-			}
+-
+-			if(to-tmp_20k_buf < SIZEOF_20KBUF)
++			} else if(to-tmp_20k_buf < SIZEOF_20KBUF)
+ 			  *to++ = *p;
+ 		    }
+ 

================================================================
Index: SOURCES/alpine-segfix.patch
diff -u /dev/null SOURCES/alpine-segfix.patch:1.1
--- /dev/null	Mon Nov  5 15:48:54 2007
+++ SOURCES/alpine-segfix.patch	Mon Nov  5 15:48:49 2007
@@ -0,0 +1,16 @@
+--- alpine-0.9999/pith/osdep/lstcmpnt.c~	2007-08-20 21:46:37.000000000 +0200
++++ alpine-0.9999/pith/osdep/lstcmpnt.c	2007-11-05 14:37:52.000000000 +0100
+@@ -44,10 +44,10 @@
+ char *
+ last_cmpnt(char *filename)
+ {
+-    register char *p = NULL, *q = filename;
++    char *p = NULL, *q = filename;
+ 
+-    if(!q)
+-      return(q);
++    if(filename == NULL)
++      return NULL;
+ 
+     while((q = strchr(q, FILE_SEP)) != NULL)
+       if(*++q)

================================================================
Index: SOURCES/alpine-ssl.patch
diff -u /dev/null SOURCES/alpine-ssl.patch:1.1
--- /dev/null	Mon Nov  5 15:48:54 2007
+++ SOURCES/alpine-ssl.patch	Mon Nov  5 15:48:49 2007
@@ -0,0 +1,25 @@
+--- alpine-0.9999/imap/src/osdep/unix/ssl_unix.c~	2007-01-10 02:41:01.000000000 +0100
++++ alpine-0.9999/imap/src/osdep/unix/ssl_unix.c	2007-11-05 14:48:17.000000000 +0100
+@@ -27,14 +27,14 @@
+  */
+ 
+ #define crypt ssl_private_crypt
+-#include <x509v3.h>
+-#include <ssl.h>
+-#include <err.h>
+-#include <pem.h>
+-#include <buffer.h>
+-#include <bio.h>
+-#include <crypto.h>
+-#include <rand.h>
++#include <openssl/x509v3.h>
++#include <openssl/ssl.h>
++#include <openssl/err.h>
++#include <openssl/pem.h>
++#include <openssl/buffer.h>
++#include <openssl/bio.h>
++#include <openssl/crypto.h>
++#include <openssl/rand.h>
+ #undef crypt
+ 
+ #define SSLBUFLEN 8192
================================================================


More information about the pld-cvs-commit mailing list