OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Apr-2008 10:03:37
Branch: HEAD Handle: 2008040609033600
Modified files:
openpkg-src/email email.patch email.spec
Log:
upgrading package: email 2.5.1 -> 3.0.0
Summary:
Revision Changes Path
1.2 +29 -26 openpkg-src/email/email.patch
1.5 +7 -2 openpkg-src/email/email.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/email/email.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 email.patch
--- openpkg-src/email/email.patch 21 Nov 2006 09:47:09 -0000 1.1
+++ openpkg-src/email/email.patch 6 Apr 2008 08:03:36 -0000 1.2
@@ -1,7 +1,7 @@
Index: configure
---- configure.orig 2006-11-20 21:13:54 +0100
-+++ configure 2006-11-21 10:36:51 +0100
-@@ -2509,9 +2509,6 @@
+--- configure.orig 2008-04-05 18:21:15 +0200
++++ configure 2008-04-06 10:01:54 +0200
+@@ -3021,9 +3021,6 @@
@@ -12,8 +12,8 @@
# Checks for libraries.
Index: email.address.template
---- email.address.template.orig 2003-07-11 20:14:29 +0200
-+++ email.address.template 2006-11-21 10:44:28 +0100
+--- email.address.template.orig 2008-02-21 19:10:21 +0100
++++ email.address.template 2008-04-06 10:01:54 +0200
@@ -1,23 +1,10 @@
-# This is the Address book for 'email'
-# Groups should be comma delimited email addresses with
@@ -47,8 +47,8 @@
+# 'Mr. Quux'
Index: email.conf
---- email.conf.orig 2006-06-13 21:58:00 +0200
-+++ email.conf 2006-11-21 10:39:57 +0100
+--- email.conf.orig 2008-04-05 16:37:11 +0200
++++ email.conf 2008-04-06 10:01:54 +0200
@@ -1,8 +1,6 @@
-# This is the DEFAULT configuration file for email.
-#
@@ -61,7 +61,7 @@
############################################################
# SMTP Server and Port number you use
-@@ -41,7 +39,7 @@
+@@ -49,7 +47,7 @@
# want address book functionality, just comment it out and
# use regular email addresses.
############################################################
@@ -70,7 +70,7 @@
############################################################
# If you would like to have a copy Of your final email saved
-@@ -70,7 +68,7 @@
+@@ -78,7 +76,7 @@
# just putting "gpg" will suffice if GPG is in your PATH
# environment variable path.
############################################################
@@ -80,20 +80,22 @@
###########################################################
# You can bypass email asking you for a password for gpg
Index: email.sig
---- email.sig.orig 2003-07-11 20:14:29 +0200
-+++ email.sig 2006-11-21 10:39:25 +0100
-@@ -1,5 +1,4 @@
--Sent using Email %v
--http://email.cleancode.org
+--- email.sig.orig 2008-04-05 16:37:11 +0200
++++ email.sig 2008-04-06 10:01:54 +0200
+@@ -1,7 +1,5 @@
+ --
+-Sent using Email %v
+-http://www.cleancode.org/projects/email
+-
-Sent on: %c
-On System: %h
+Time: %c
+Agent: OpenPKG's Email %v
+System: %h
Index: install.sh
---- install.sh.orig 2005-02-16 02:18:16 +0100
-+++ install.sh 2006-11-21 10:36:51 +0100
+--- install.sh.orig 2008-02-21 19:10:21 +0100
++++ install.sh 2008-04-06 10:01:54 +0200
@@ -251,16 +251,5 @@
exit 2
fi
@@ -111,14 +113,15 @@
-EOF
-Index: src/getopt.c
---- src/getopt.c.orig 2006-06-13 05:34:52 +0200
-+++ src/getopt.c 2006-11-21 10:36:51 +0100
-@@ -30,6 +30,7 @@
- # define _NO_PROTO
- #endif
-
-+#include "config.h"
- #include <stdio.h>
+Index: src/Makefile.in
+--- src/Makefile.in.orig 2008-02-24 05:11:20 +0100
++++ src/Makefile.in 2008-04-06 10:02:24 +0200
+@@ -18,7 +18,7 @@
+ remotesmtp.o sig_file.o smtpcommands.o utils.o
+
+ all: $(FILES)
+- $(CC) $(CFLAGS) -o email $(FILES) $(OTHER_FILES) $(LDFLAGS) $(LIBS)
$(DLIB)
++ $(CC) $(CFLAGS) -o email $(FILES) $(OTHER_FILES) $(DLIB) $(LDFLAGS)
$(LIBS)
- /* Comment out all this code if we are using the GNU C Library, and are not
+ clean:
+ rm -f *.o *.d email
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/email/email.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 email.spec
--- openpkg-src/email/email.spec 1 Jan 2008 14:53:31 -0000 1.4
+++ openpkg-src/email/email.spec 6 Apr 2008 08:03:36 -0000 1.5
@@ -31,8 +31,8 @@
Class: EVAL
Group: Mail
License: GPL
-Version: 2.5.1
-Release: 20080101
+Version: 3.0.0
+Release: 20080406
# list of sources
Source0:
http://www.cleancode.org/downloads/email/email-%{version}.tar.gz
@@ -43,6 +43,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130
PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: openssl
+PreReq: openssl
AutoReq: no
AutoReqProv: no
@@ -68,6 +70,9 @@
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
+ LIBS="-lssl -lcrypto" \
./configure \
--prefix=%{l_prefix}
%{l_make} %{l_mflags -O}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
