packages: re-alpine/re-alpine-ssl.patch, re-alpine/re-alpine.spec - builds, ...

[blues]

Author: blues                        Date: Thu May 12 15:18:51 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- builds, needs testing

---- Files affected:
packages/re-alpine:
   re-alpine-ssl.patch (1.1 -> 1.2) , re-alpine.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/re-alpine/re-alpine-ssl.patch
diff -u packages/re-alpine/re-alpine-ssl.patch:1.1 packages/re-alpine/re-alpine-ssl.patch:1.2
--- packages/re-alpine/re-alpine-ssl.patch:1.1	Thu May 12 16:37:16 2011
+++ packages/re-alpine/re-alpine-ssl.patch	Thu May 12 17:18:46 2011
@@ -1,9 +1,9 @@
---- 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 @@
-  */
+--- ./imap/src/osdep/unix/ssl_unix.c.org	2010-10-02 10:37:57.000000000 +0200
++++ ./imap/src/osdep/unix/ssl_unix.c	2011-05-12 16:42:14.772573334 +0200
+@@ -28,14 +28,14 @@
  
  #define crypt ssl_private_crypt
+ #define STRING ssl_private_STRING
 -#include <x509v3.h>
 -#include <ssl.h>
 -#include <err.h>
@@ -21,5 +21,5 @@
 +#include <openssl/crypto.h>
 +#include <openssl/rand.h>
  #undef crypt
+ #undef STRING
  
- #define SSLBUFLEN 8192

================================================================
Index: packages/re-alpine/re-alpine.spec
diff -u packages/re-alpine/re-alpine.spec:1.1 packages/re-alpine/re-alpine.spec:1.2
--- packages/re-alpine/re-alpine.spec:1.1	Thu May 12 16:37:16 2011
+++ packages/re-alpine/re-alpine.spec	Thu May 12 17:18:46 2011
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	Kontynuacja klienta pocztowego Alpine z Uniwersytetu w Waszyngtonie
 Name:		re-alpine
 Version:	2.02
-Release:	0.1
+Release:	0.2
 License:	Apache v2.0
 Group:		Applications/Mail
 # Main site:
@@ -124,7 +124,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-#patch5 -p1
+%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 
@@ -171,7 +171,6 @@
 install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 ln -s re-alpine $RPM_BUILD_ROOT%{_bindir}/pine
-ln -s re-alpine $RPM_BUILD_ROOT%{_bindir}/alpine
 
 $RPM_BUILD_ROOT%{_bindir}/alpine -conf > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/alpine.conf
 cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/alpine.conf.fixed
@@ -196,11 +195,11 @@
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/alpine.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/alpine.conf.fixed
-%attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/alpine
 %attr(755,root,root) %{_bindir}/pine
 %attr(755,root,root) %{_bindir}/rpload
 %attr(755,root,root) %{_bindir}/rpdump
-%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/alpine.1*
 %{_mandir}/man1/rpload.1*
 %{_mandir}/man1/rpdump.1*
 %{_desktopdir}/%{name}.desktop
@@ -223,6 +222,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2011/05/12 15:18:46  blues
+- builds, needs testing
+
 Revision 1.1  2011/05/12 14:37:16  blues
 - taken from alpine - alpine fork. UW no longer supports alpine.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/re-alpine/re-alpine-ssl.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/re-alpine/re-alpine.spec?r1=1.1&r2=1.2&f=u