diff options
Diffstat (limited to 'source/n/alpine')
| -rwxr-xr-x | source/n/alpine/alpine.SlackBuild | 26 | ||||
| -rw-r--r-- | source/n/alpine/alpine.tech-notes.txt.diff | 136 |
2 files changed, 15 insertions, 147 deletions
diff --git a/source/n/alpine/alpine.SlackBuild b/source/n/alpine/alpine.SlackBuild index 5bf3b445d..9f2a91c87 100755 --- a/source/n/alpine/alpine.SlackBuild +++ b/source/n/alpine/alpine.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2015 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,15 +22,15 @@ PKGNAM=alpine -VERSION=${VERSION:-2.11} -ALPINEBUILD=${ALPINEBUILD:-1} -IMAPDBUILD=${IMAPDBUILD:-1} +VERSION=${VERSION:-2.20} +ALPINEBUILD=${ALPINEBUILD:-2} +IMAPDBUILD=${IMAPDBUILD:-2} PINEPGP=${PINEPGP:-0.18.0} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -46,8 +46,8 @@ PKG=$TMP/package-${PKGNAM} rm -rf $PKG mkdir -p $PKG/etc -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then @@ -62,7 +62,7 @@ cd alpine-$VERSION # Make sure ownerships and permissions are sane: chown -R root:root . find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 700 -o -perm 555 -o -perm 511 \) \ -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; @@ -79,6 +79,7 @@ CFLAGS="$SLKCFLAGS" \ --with-c-client-target=slx \ --with-system-pinerc=/etc/pine.conf \ --with-system-fixed-pinerc=/etc/pine.conf.fixed \ + --with-passfile=.alpine.passfile \ --disable-debug \ --with-debug-level=0 \ --without-tcl \ @@ -87,7 +88,11 @@ CFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux # Correct paths and programs in tech-notes.txt: -zcat $CWD/alpine.tech-notes.txt.diff.gz | patch -p1 --verbose || exit 1 +( cd doc/tech-notes + sed -i "s,/usr/local/lib/pine.info,/usr/lib/pine.info,g" tech-notes.txt + sed -i "s,/usr/local/lib,/etc,g" tech-notes.txt + sed -i "s,/usr/local,/etc,g" tech-notes.txt +) # Build and install: # Since we build non-compliant to RFC3501 we have to answer 'y' half-way: @@ -102,9 +107,8 @@ make install SSLTYPE=unix DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ LICENSE NOTICE README* VERSION \ - doc/tech-notes.txt doc/brochure.txt doc/mailcap.unx doc/mime.types \ + doc/tech-notes* doc/brochure.txt doc/mailcap.unx doc/mime.types \ $PKG/usr/doc/${PKGNAM}-$VERSION -gzip -9 $PKG/usr/doc/${PKGNAM}-$VERSION/tech-notes.txt # Add pinepgp support: cd $TMP diff --git a/source/n/alpine/alpine.tech-notes.txt.diff b/source/n/alpine/alpine.tech-notes.txt.diff deleted file mode 100644 index 3af68e921..000000000 --- a/source/n/alpine/alpine.tech-notes.txt.diff +++ /dev/null @@ -1,136 +0,0 @@ ---- ./doc/tech-notes.txt.orig 2008-03-17 17:26:52.000000000 -0500 -+++ ./doc/tech-notes.txt 2008-08-06 21:16:06.000000000 -0500 -@@ -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. - -@@ -600,8 +600,8 @@ - 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/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 -@@ -674,11 +674,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 -+ /etc/pine.info - Local pointer to system administrator. - ~/.pinerc - Personal configuration file for each user. -@@ -872,10 +872,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 -@@ -973,7 +973,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. -@@ -1180,8 +1180,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_ -@@ -3538,7 +3538,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, -@@ -3932,12 +3932,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}'")_ /usr/bin/firefox, -+ /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 /usr/bin/firefox 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. -@@ -10273,9 +10273,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 -@@ -10524,7 +10524,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. - _________________________________________________________________ - -@@ -11366,7 +11366,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 |