packages: re-alpine/pico.desktop (NEW), re-alpine/re-alpine-doc.patch (NEW)...
blues
blues at pld-linux.org
Thu May 12 16:37:21 CEST 2011
Author: blues Date: Thu May 12 14:37:21 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- taken from alpine - alpine fork. UW no longer supports alpine.
---- Files affected:
packages/re-alpine:
pico.desktop (NONE -> 1.1) (NEW), re-alpine-doc.patch (NONE -> 1.1) (NEW), re-alpine-fhs.patch (NONE -> 1.1) (NEW), re-alpine-filter.patch (NONE -> 1.1) (NEW), re-alpine-home_etc.patch (NONE -> 1.1) (NEW), re-alpine-index_display.patch (NONE -> 1.1) (NEW), re-alpine-libc-client.patch (NONE -> 1.1) (NEW), re-alpine-no_1777_warning.patch (NONE -> 1.1) (NEW), re-alpine-ssl.patch (NONE -> 1.1) (NEW), re-alpine.desktop (NONE -> 1.1) (NEW), re-alpine.png (NONE -> 1.1) (NEW), re-alpine.spec (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/re-alpine/pico.desktop
diff -u /dev/null packages/re-alpine/pico.desktop:1.1
--- /dev/null Thu May 12 16:37:21 2011
+++ packages/re-alpine/pico.desktop Thu May 12 16:37:16 2011
@@ -0,0 +1,38 @@
+[Desktop Entry]
+Name=Pico
+Comment=Pico text editor
+Comment[bg]=Pico текстов редактор
+Comment[ca]=L'editor de text Pico
+Comment[cs]=Textový editor Pico
+Comment[da]=Pico tekstbehandleren
+Comment[de]=Der Texteditor Pico
+Comment[el]=Επεξεργαστής κειμένου Pico
+Comment[es]=Editor de textos Pico
+Comment[et]=Tekstiredaktor Pico
+Comment[eu]=Pico testu editorea
+Comment[fi]=Pico-editori
+Comment[fr]=Editeur de texte Pico
+Comment[ga]=Eagarthóir Teacs Pico
+Comment[gl]=Editor de texto Pico
+Comment[hu]=Pico szövegszerkesztő
+Comment[it]=Editor di testo Pico
+Comment[ja]=Picoテキストエディタ
+Comment[ko]=이맥스 문서 편집기
+Comment[nb]=Teksteditoren Pico
+Comment[nl]=Pico tekst editor
+Comment[pl]=Edytor tekstu Pico
+Comment[pt]=Editor de texto Pico
+Comment[pt_BR]=Editor de texto Pico
+Comment[ru]=Текстовый редактор Pico
+Comment[sv]=Pico texteditor
+Comment[tr]=Pico metin editörü
+Comment[uk]=Текстовий редактор
+Comment[wa]=L' aspougneu di tekse Pico
+Comment[zh_CN]=Pico 文字编缉器
+Comment[zh_TW]=Pico 文字編緝器
+Icon=
+Exec=pico
+Terminal=true
+Type=Application
+Categories=ConsoleOnly;TextEditor;
+# vi: encoding=utf-8
================================================================
Index: packages/re-alpine/re-alpine-doc.patch
diff -u /dev/null packages/re-alpine/re-alpine-doc.patch:1.1
--- /dev/null Thu May 12 16:37:21 2011
+++ packages/re-alpine/re-alpine-doc.patch Thu May 12 16:37:16 2011
@@ -0,0 +1,251 @@
+--- ./doc/tech-notes.txt.org 2008-03-25 21:28:28.958953593 +0100
++++ ./doc/tech-notes.txt 2008-03-25 21:36:04.727408589 +0100
+@@ -271,14 +271,14 @@ SMTP and Sendmail
+ 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/alpine/alpine.conf.fixed
++ 2. _smtp-server_ in /etc/alpine/alpine.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/alpine/alpine.conf
++ 8. _smtp-server_ in /etc/alpine/alpine.conf
+ 9. DF_SENDMAIL_PATH defined at compile time.
+ 10. SENDMAIL and SENDMAILFLAGS defined at compile time.
+
+@@ -595,24 +595,24 @@ Installing Alpine and Pico on UNIX Platf
+
+ 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
+- though sometimes they are placed in /usr/bin. All the help text is compiled
++ directory on your system. Most often the binaries go in /usr/bin
++ though sometimes they are placed in /usr/local/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/alpine/alpine.conf, and /etc/alpine/alpine.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
+ generic version which suggests ``talking to the computer support staff at
+- your site'' is shown. The file pine.conf is used to set system-wide default
+- configurations for _Alpine_. The file pine.conf.fixed is also used to set
++ your site'' is shown. The file alpine.conf is used to set system-wide default
++ configurations for _Alpine_. The file alpine.conf.fixed is also used to set
+ system-wide default configurations for _Alpine_. The difference between
+- these two files is that configuration variables set in the pine.conf.fixed
++ these two files is that configuration variables set in the alpine.conf.fixed
+ file may not normally be over-ridden by a user. See the section on Alpine
+- Configuration later in this document for details about the pine.conf and
+- pine.conf.fixed files.
++ Configuration later in this document for details about the alpine.conf and
++ alpine.conf.fixed files.
+ _________________________________________________________________
+
+ Installing PC-Alpine
+@@ -674,11 +674,11 @@ Support Files and Environment Variables:
+ 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/alpine/alpine.conf
+ Pine's global configuration file.
+- /usr/local/lib/pine.conf.fixed
++ /etc/alpine/alpine.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.
+@@ -872,10 +872,10 @@ Alpine
+ 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/alpine/alpine.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/alpine/alpine.conf
+ A system configuration file is not required.
+ -convert_sigs _-p pinerc_
+ Convert signatures contained in signature files into literal
+@@ -973,7 +973,7 @@ Alpine
+ 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/alpine/alpine.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.
+@@ -1180,10 +1180,10 @@ Alpine Configuration
+ 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/alpine/alpine.conf or
++ /etc/alpine/alpine.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
++ --with-system-fixed-pinerc=VALUE.) The location of the alpine.conf file can be
+ changed with the -P command line argument. Both _Alpine_ and _PC-Alpine_
+ also use personal (user-based) configuration files. On UNIX machines, the
+ personal configuration file is the file ~/.pinerc. For _PC-Alpine_ systems,
+@@ -1192,7 +1192,7 @@ Alpine Configuration
+ configuration file can be specified with the -p command line argument.
+
+ All of these configuration files, other than the fixed system config
+- pine.conf.fixed on UNIX systems, may optionally be remote configuration
++ alpine.conf.fixed on UNIX systems, may optionally be remote configuration
+ files instead of local files. This is discussed further in the following
+ section and in Remote Configuration.
+
+@@ -3538,7 +3538,7 @@ index-format=STATUS MSGNO SMARTDATETIME2
+ 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/alpine/alpine.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,
+@@ -3932,15 +3932,15 @@ index-format=STATUS MSGNO SMARTDATETIME2
+ 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}'")_ /usr/bin/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,
+- 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.
++ file /usr/bin/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.
+ _use-only-domain-name_
+ Can be set to _yes_ or _no._ Anything but _yes_ means _no._ If set to
+ _yes_ the first label in the host name will be lopped off to get the
+@@ -10273,9 +10273,9 @@ Configuration Inheritance
+ 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/alpine/alpine.conf.fixed.
+
+- The system-wide configuration file is normally /usr/local/lib/pine.conf for
++ The system-wide configuration file is normally /etc/alpine/alpine.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
+@@ -10524,7 +10524,7 @@ SMTP Servers
+ * 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/alpine/alpine.conf, /etc/alpine/alpine.conf.fixed or
+ ~/.pinerc.
+ _________________________________________________________________
+
+@@ -10533,7 +10533,7 @@ MIME.Types file
+ _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
++ /usr/lib/mime.types and /etc/mime.types, and a user specific
+ ~/.mime.types file.
+
+ In Windows, _Alpine_ looks in the same directory as the PINERC file and the
+@@ -11366,7 +11366,7 @@ Printers and Printing
+
+ 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/alpine/alpine.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
+--- ./doc/alpine.1.org 2008-03-15 00:53:39.000000000 +0100
++++ ./doc/alpine.1 2008-03-25 21:39:17.983313992 +0100
+@@ -113,7 +113,7 @@ argument is applied to the first defined
+ .IP \fB-conf\fR 20
+ Produce a sample/fresh copy of the
+ system-wide configuration file,
+-.I pine.conf,
++.I alpine.conf,
+ on the standard output. This is distinct from the per-user
+ .I .pinerc
+ file.
+@@ -176,7 +176,7 @@ Use
+ .I config-file
+ as the configuration file instead of default
+ system-wide configuration file
+-.IR pine.conf .
++.IR alpine.conf .
+ .IP \fB-pinerc\ \fIfile\fR 20
+ Output fresh pinerc configuration to
+ .I file, preserving the settings of variables that the user has made.
+@@ -255,7 +255,7 @@ increasing precedence:
+ o built-in defaults.
+ .br
+ o system-wide
+-.I pine.conf
++.I alpine.conf
+ file.
+ .br
+ o personal
+@@ -265,7 +265,7 @@ file (may be set via built-in Setup/Conf
+ o command-line options.
+ .br
+ o system-wide
+-.I pine.conf.fixed
++.I alpine.conf.fixed
+ file.
+
+ There is one exception to the rule that configuration values are replaced
+@@ -285,7 +285,7 @@ uses the following environment variables
+ .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
+@@ -305,13 +305,13 @@ uses the following environment variables
+ .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.
++/usr/lib/alpine.conf System-wide configuration file.
+ .br
+-/usr/local/lib/pine.conf.fixed Non-overridable configuration file.
++/usr/lib/alpine.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
================================================================
Index: packages/re-alpine/re-alpine-fhs.patch
diff -u /dev/null packages/re-alpine/re-alpine-fhs.patch:1.1
--- /dev/null Thu May 12 16:37:21 2011
+++ packages/re-alpine/re-alpine-fhs.patch Thu May 12 16:37:16 2011
@@ -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: packages/re-alpine/re-alpine-filter.patch
diff -u /dev/null packages/re-alpine/re-alpine-filter.patch:1.1
--- /dev/null Thu May 12 16:37:21 2011
+++ packages/re-alpine/re-alpine-filter.patch Thu May 12 16:37:16 2011
@@ -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: packages/re-alpine/re-alpine-home_etc.patch
diff -u /dev/null packages/re-alpine/re-alpine-home_etc.patch:1.1
--- /dev/null Thu May 12 16:37:21 2011
+++ packages/re-alpine/re-alpine-home_etc.patch Thu May 12 16:37:16 2011
@@ -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: packages/re-alpine/re-alpine-index_display.patch
diff -u /dev/null packages/re-alpine/re-alpine-index_display.patch:1.1
--- /dev/null Thu May 12 16:37:21 2011
+++ packages/re-alpine/re-alpine-index_display.patch Thu May 12 16:37:16 2011
@@ -0,0 +1,14 @@
+--- ./pith/mailindx.c.org 2007-09-06 18:18:49.000000000 +0000
++++ ./pith/mailindx.c 2007-09-07 11:49:13.000000000 +0000
+@@ -147,9 +147,9 @@
+ static INDEX_COL_S answer_default[] = {
+ {iStatus, Fixed, 3},
+ {iMessNo, WeCalculate},
+- {iSDateTime24, WeCalculate},
++ {iSDateTimeIso24, WeCalculate},
+ {iFromTo, Percent, 33}, /* percent of rest */
+- {iSizeNarrow, WeCalculate},
++ {iKSize, WeCalculate},
+ {iSubjKey, Percent, 67},
+ {iNothing}
+ };
================================================================
Index: packages/re-alpine/re-alpine-libc-client.patch
diff -u /dev/null packages/re-alpine/re-alpine-libc-client.patch:1.1
--- /dev/null Thu May 12 16:37:21 2011
+++ packages/re-alpine/re-alpine-libc-client.patch Thu May 12 16:37:16 2011
@@ -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: packages/re-alpine/re-alpine-no_1777_warning.patch
diff -u /dev/null packages/re-alpine/re-alpine-no_1777_warning.patch:1.1
--- /dev/null Thu May 12 16:37:21 2011
+++ packages/re-alpine/re-alpine-no_1777_warning.patch Thu May 12 16:37:16 2011
@@ -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: packages/re-alpine/re-alpine-ssl.patch
diff -u /dev/null packages/re-alpine/re-alpine-ssl.patch:1.1
--- /dev/null Thu May 12 16:37:21 2011
+++ packages/re-alpine/re-alpine-ssl.patch Thu May 12 16:37:16 2011
@@ -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
================================================================
Index: packages/re-alpine/re-alpine.desktop
diff -u /dev/null packages/re-alpine/re-alpine.desktop:1.1
--- /dev/null Thu May 12 16:37:21 2011
+++ packages/re-alpine/re-alpine.desktop Thu May 12 16:37:16 2011
@@ -0,0 +1,30 @@
+[Desktop Entry]
+Name=AlPine
+Comment=The AlPine Mail Reader
+Comment[br]=ALPINE n'eo ket ELM
+Comment[ca]=ALPINE no és ELM
+Comment[cs]=Poštovní program AlPine
+Comment[da]=ALPINE er ikke ELM
+Comment[de]=ALPINE Mailprogramm
+Comment[es]=Cliente de correo (ALPINE no es ELM)
+Comment[fi]=PINE -postiohjelma
+Comment[fr]=Client de messagerie "alPine Is Not Elm" (AlPine n'est pas Elm)
+Comment[hr]=Program za elektronsku poštu
+Comment[hu]=ALPINE szöveges levelező program
+Comment[is]=alpine: Póstforritið AlPine
+Comment[it]=ALPINE non e' ELM (programma posta)
+Comment[nb]=ALPINE-epostprogram
+Comment[pl]=Program pocztowy ALPINE
+Comment[pt]=Cliente de email
+Comment[pt_BR]=Cliente de email
+Comment[ro]=Client de poştă
+Comment[ru]=Почтовый клиент AlPine (alPine is not ELM, Pine это не ELM)
+Comment[sk]=Poštový program AlPine (alPine is not ELM)
+Comment[sl]=Program za branje e-pošte AlPine
+Comment[sv]=ALPINE mejlprogram
+Icon=alpine
+Exec=alpine
+Terminal=true
+Type=Application
+Categories=ConsoleOnly;Network;Email;
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list